Call gsk_render_node_draw() instead of creating fallback renderers
authorBenjamin Otte <otte@redhat.com>
Tue, 13 Dec 2016 02:15:07 +0000 (03:15 +0100)
committerBenjamin Otte <otte@redhat.com>
Tue, 20 Dec 2016 17:01:10 +0000 (18:01 +0100)
gsk/gskvulkanrenderpass.c
gtk/inspector/rendernodeview.c

index 595ad63e31e5afb1af30b7cfe64976a83722064a..62af7e324cf40ae39d13bff7ee1de696a2745bcd 100644 (file)
@@ -141,7 +141,6 @@ gsk_vulkan_render_pass_upload_fallback (GskVulkanRenderPass *self,
                                         VkCommandBuffer      command_buffer)
 {
   graphene_rect_t bounds;
-  GskRenderer *fallback;
   cairo_surface_t *surface;
   cairo_t *cr;
 
@@ -153,11 +152,7 @@ gsk_vulkan_render_pass_upload_fallback (GskVulkanRenderPass *self,
   cr = cairo_create (surface);
   cairo_translate (cr, bounds.origin.x, bounds.origin.y);
 
-  fallback = gsk_renderer_create_fallback (gsk_vulkan_render_get_renderer (render),
-                                           &bounds,
-                                           cr);
-  gsk_renderer_render (fallback, op->node, NULL);
-  g_object_unref (fallback);
+  gsk_render_node_draw (op->node, cr);
   
   cairo_destroy (cr);
 
index 423be837afee7561f467e714d571b1e7cffacc96..3d0b81b5f14faad0ab391a6a7ad62e536bbb9309 100644 (file)
@@ -225,7 +225,6 @@ gtk_render_node_view_snapshot (GtkWidget   *widget,
   GtkRenderNodeViewPrivate *priv = gtk_render_node_view_get_instance_private (view);
   GdkRectangle viewport;
   graphene_rect_t rect;
-  GskRenderer *fallback;
   int width, height;
   cairo_t *cr;
 
@@ -249,12 +248,7 @@ gtk_render_node_view_snapshot (GtkWidget   *widget,
     }
   cairo_translate (cr, - viewport.x - viewport.width / 2.0, - viewport.y - viewport.height / 2.0);
 
-  fallback = gsk_renderer_create_fallback (gtk_snapshot_get_renderer (snapshot),
-                                           &GRAPHENE_RECT_INIT (viewport.x, viewport.y,
-                                                                viewport.width, viewport.height),
-                                           cr);
-  gsk_renderer_render (fallback, priv->render_node, NULL);
-  g_object_unref (fallback);
+  gsk_render_node_draw (priv->render_node, cr);
 
   if (priv->render_region)
     {